From 14b3ef36453ea2652d5316db7a98b2a248c0c660 Mon Sep 17 00:00:00 2001 From: Tim Deegan Date: Wed, 8 Dec 2010 10:46:31 +0000 Subject: [PATCH] x86/mm: change ASSERTs to BUG_ONs in mem_sharing.c These two ASSERTs have important side-effects so make them into BUG_ONs consistent with the rest of the file. Bug found by Jui-Hao Chiang . Signed-off-by: Tim Deegan --- xen/arch/x86/mm/mem_sharing.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/mm/mem_sharing.c b/xen/arch/x86/mm/mem_sharing.c index 2c228233dd..10980dd925 100644 --- a/xen/arch/x86/mm/mem_sharing.c +++ b/xen/arch/x86/mm/mem_sharing.c @@ -545,7 +545,7 @@ int mem_sharing_nominate_page(struct p2m_domain *p2m, * it a few lines above. * The mfn needs to revert back to rw type. This should never fail, * since no-one knew that the mfn was temporarily sharable */ - ASSERT(page_make_private(d, page) == 0); + BUG_ON(page_make_private(d, page) != 0); mem_sharing_hash_destroy(hash_entry); mem_sharing_gfn_destroy(gfn_info, 0); shr_unlock(); @@ -700,7 +700,7 @@ gfn_found: unmap_domain_page(s); unmap_domain_page(t); - ASSERT(set_shared_p2m_entry(p2m, gfn, page_to_mfn(page)) != 0); + BUG_ON(set_shared_p2m_entry(p2m, gfn, page_to_mfn(page)) == 0); put_page_and_type(old_page); private_page_found: -- 2.30.2